From 21c246e8ebc80cfe239ce2eceb80b664acd1fbb4 Mon Sep 17 00:00:00 2001 From: robertlipe Date: Tue, 31 Dec 2013 19:43:08 +0000 Subject: [PATCH] Compile fix for Ubuntu. Fix valgrind warning from scribble code. --- gpsbabel/gbfile.cc | 2 +- gpsbabel/google.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gpsbabel/gbfile.cc b/gpsbabel/gbfile.cc index d417e15e1..7244e7390 100644 --- a/gpsbabel/gbfile.cc +++ b/gpsbabel/gbfile.cc @@ -21,7 +21,7 @@ */ #include "defs.h" -#include "zconf.h" +#include "zlib/zconf.h" #include "gbfile.h" #include diff --git a/gpsbabel/google.cc b/gpsbabel/google.cc index 6ce27aa95..c18e7b049 100644 --- a/gpsbabel/google.cc +++ b/gpsbabel/google.cc @@ -255,10 +255,10 @@ void goog_poly_e(xg_string args, const QXmlStreamAttributes* unused) // NEW_STRINGS FIXME(robertlipe): this is broken somehow there should be no need // to overallocate like this, but it's needed ot get an1 to not scribble // on itself. - wpt_tmp->shortname = (char*) xmalloc(7000); #if NEW_STRINGS wpt_tmp->shortname = QString().sprintf( "\\%5.5x", serial++); #else + wpt_tmp->shortname = (char*) xmalloc(7); sprintf(wpt_tmp->shortname, "\\%5.5x", serial++); #endif route_add_wpt(routehead[goog_segroute], wpt_tmp); -- 2.30.2